Merge branch to update Org mode to version 7.4
authorCarsten Dominik <carsten.dominik@gmail.com>
Sat, 11 Dec 2010 16:44:32 +0000 (17:44 +0100)
committerCarsten Dominik <carsten.dominik@gmail.com>
Sat, 11 Dec 2010 16:44:32 +0000 (17:44 +0100)

Trivial merge